Related Issues

Closes #37071

Summary

Adds the ability for administrators to remove users from organizations directly from the admin user details page (/-/admin/users/{userid}). This feature provides both individual organization removal and bulk removal from all organizations.

Motivation

Currently, administrators need to navigate to each organization separately to remove a user from multiple organizations. This enhancement streamlines user management by allowing admins to perform these actions directly from the user details page.

Implementation

Backend (Go)

routers/web/admin/users.go (Modified)

• Added RemoveUserFromOrg() - Removes a user from a single organization
• Added RemoveUserFromAllOrgs() - Removes a user from all organizations
• Both functions reuse the existing org_service.RemoveOrgUser() service
• Handles edge cases:
  • Last owner protection (cannot remove if user is the only owner)
  • Partial removal tracking (shows count of successful removals)
  • Empty organization list
• Added org_service import

routers/web/web.go (Modified)

• Registered POST route: /{userid}/orgs/{orgid}/remove
• Registered POST route: /{userid}/orgs/remove-all

Frontend (Templates)

templates/admin/user/view.tmpl (Modified)

• Added "Remove All" button in the Organizations section header
• Added confirmation modal for "Remove All" action with:
  • Descriptive warning message
  • User name and organization count
  • Cancel and confirm buttons

templates/admin/user/view_orgs.tmpl (New)

• Custom organization list template with individual "Remove" buttons
• Based on explore/user_list.tmpl but with admin-specific actions
• Shows organization details:
  • Name
  • Visibility
  • Join date
• Individual "Remove" button for each organization

Localization

options/locale/locale_en-US.json (Modified)

Added:

• admin.users.org_removed - Success message for single removal
• admin.users.all_orgs_removed - Success message for bulk removal
• admin.users.no_orgs_to_remove - Info message when user has no organizations
• admin.users.no_orgs_removed - Error message when no removals succeeded
• admin.users.some_orgs_removed - Partial success message with count
• admin.users.remove_all_orgs_title - Modal title
• admin.users.remove_all_orgs_desc - Modal confirmation message

Tests

tests/integration/admin_user_org_test.go (New)

• TestAdminRemoveUserFromOrg - Tests single organization removal
• TestAdminRemoveUserFromAllOrgs - Tests bulk removal from all organizations
• Verifies database state changes
• Tests with non-owner users to avoid last-owner constraint

Features

• ✅ Remove user from a single organization
• ✅ Remove user from all organizations with confirmation
• ✅ Last owner protection (prevents removing if user is the sole owner)
• ✅ Graceful error handling with informative messages
• ✅ Partial removal tracking (shows how many removals succeeded)
• ✅ Integration tests

UI Changes

Before

No option to remove users from organizations on the admin user page.

After

1. "Remove All" button at the top-right of the Organizations section
2. Individual "Remove" button next to each organization
3. Confirmation modal for bulk removal

Screenshots

Security Considerations

• Reuses existing org_service.RemoveOrgUser() which includes proper permission checks
• CSRF protection on all POST requests
• Only accessible to administrators
• Cannot remove the last owner of an organization

Testing

Run integration tests:

go test -v ./tests/integration -run TestAdminRemoveUserFrom

Development Note

This PR was developed with assistance from Amazon Q Developer and Gemini.